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