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