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