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