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