Merge "Don't use std::stoi()" into mainline-prod am: 671e241bf2

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/MediaProvider/+/13007436

Change-Id: Icda0e6bacec1b3f51fc632959d8e6e1c1ba39f97