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