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