Merge "[automerger skipped] Merge "Use PersistableBundle.getInt(String, int)...

Merge "[automerger skipped] Merge "Use PersistableBundle.getInt(String, int) with default value parameter" into udc-dev am: c74bedd8 am: 72c0cb8a am: 67904132 -s ours" into udc-qpr-dev-plus-aosp am: cc49e875 -s ours

am skip reason: Merged-In Icf83ec1a50972b2d9ce7d168dad75dd9aa3cf1bb with SHA-1 4030b617 is already in history

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



Change-Id: Idd969dddf028b132c58393b00690716566696043
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>