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