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