[automerger skipped] Merge "DO NOT MERGE Do not update bar control target when...

[automerger skipped] Merge "DO NOT MERGE Do not update bar control target when application is starting" into rvc-qpr-dev am: aeab9755 am: 483db6ea -s ours

am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id939c26001c7b0def2a185798438dcee1a18b8a3