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