DO NOT MERGE - Merge ab/7272582 am: e9ec4da19a

Original change: https://android-review.googlesource.com/c/platform/frameworks/wilhelm/+/1735935

Change-Id: I503d3376f1998391c80f36710ca60072c71dd194