[automerger skipped] Merge "Implement flag to not relaunch on dock config...

[automerger skipped] Merge "Implement flag to not relaunch on dock config change for apps without -desk resources" into tm-qpr-dev am: 077ca39f am: 5a9e289e -s ours am: a34cf3f1 -s ours

am skip reason: Merged-In Ib9eeb251f803e41ff8fd0ed56f1ea8d52e67ba81 with SHA-1 d631b010 is already in history

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



Change-Id: I2f50a41313ce372c9be46694f7f44480c6f85ef5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>