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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

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