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