Merge "Don't set extreme values of Integer to safe bounds" into tm-dev am: 0a194469f0

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

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