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