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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If9e83003de2a3a0b227ca558264403be312fa1e6
tree: 71ce01ba5304d43e37cc54c7e1b55235d3a24794
  1. core/
  2. services/
  3. tests/