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

[automerger skipped] Use PersistableBundle.getInt(String, int) with default value parameter am: 4030b617 -s ours am: c57430a3 -s ours am: f10c1fee -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: I8f695ad4be99da3d27ce22f54e713a76354c7590
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>