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