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