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