[automerger skipped] Merge "Merge Android R" am: 36cfa7db -s ours am:...

[automerger skipped] Merge "Merge Android R" am: 36cfa7db -s ours am: 3fd14885 -s ours am: a486aae1 -s ours

am skip reason: Change-Id I7972af3db5cb995b4a7c4deb982eeef6c3dddaad with SHA-1 ada75ad5 is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1421782

Change-Id: I4185295946132a254d112db31c4f7ef39c34c691