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

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

Change-Id: I05aad42f7077ee8f285e8df581608e872731834c