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