Merge "Update top bar with new settings intent" into rvc-dev am: abaab46da7 am: f083ce9803

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11385692

Change-Id: I57b4d470fdd7c02ce556c60d3589f7a50938e2db