Snap for 7435440 from 44133e7d738f752f1637ff628695f0d050b2199f to sc-release am: 49ef93a626

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

Change-Id: I6a759649b803c46f4eb01d96d45622e11e7ae64a