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