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