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