[automerger skipped] Merge "Catch if an invalid constant is sent" into tm-dev...

[automerger skipped] Merge "Catch if an invalid constant is sent" into tm-dev am: 8c3195cb -s ours am: 3839d514 -s ours

am skip reason: Merged-In I4c9fc065c7a4c96bf51a2d14a1eb1c7abe543a9a with SHA-1 edd059b3 is already in history

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



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