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