[automerger skipped] Merge "DO NOT MERGE - Merge ab/7272582" am: 120755cf0f am: b4fd8696cb am: d90428555a -s ours

am skip reason: subject contains skip directive

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

Change-Id: Idbe7e37586f4236f73e50d942e9d044dc2d8ec8b