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