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