Merge "Merge "Do not ignore forceReload requests" into tm-dev am: 8ed3ef0f...

Merge "Merge "Do not ignore forceReload requests" into tm-dev am: 8ed3ef0f am: 750fca80 am: c339e32f" into tm-qpr-dev-plus-aosp am: f8d128b2

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



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