Merge "DO NOT MERGE - Merge ab/7272582" am: 120755cf0f

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

Change-Id: I400d91da91e1afcd748c781e06a165ac3518de7b