Merge "Force reload listings for ControlsStartable" into tm-qpr-dev am: 1f460f76 am: a9520ac3

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



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