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