Merge "Fix a crash in eng builds" am: 26d146ff7f am: 99890b486d am: f65b271328

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6e1c20b4c1004e8205d65f318939ee7d8b006f00
tree: cc13d27c53fa3b2e8cb8b5250ecc6ad9e0671853
  1. core/
  2. services/
  3. tests/