Merge "Do not call pop_back when app has no uses-sdk" into sc-dev am:...

Merge "Do not call pop_back when app has no uses-sdk" into sc-dev am: 47e58f12 am: a73daaeb am: 8d862438

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14664167

Change-Id: I6b46deeaf9b95a621f95915a11e74609465ebcf4