Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234803 Change-Id: I2b7d2833a72412e359fa1680ab2852edec58672a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>