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