Merge "Fix a crash in eng builds" am: 0fc25a8693 am: 4fb275ef08 am: ea91bdb31e

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6e1c20b4c1004e8205d65f318939ee7d8b006f00