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