Merge "Don't set extreme values of Integer to safe bounds" into tm-dev am: 0a194469 am: 7f002950 am: 2f6389cd

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



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