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

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

am skip reason: Merged-In Icf83ec1a50972b2d9ce7d168dad75dd9aa3cf1bb with SHA-1 49f9216a is already in history

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



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