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