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

Merge "Do not ignore forceReload requests" into tm-dev am: 8ed3ef0f am: fcb8e4e0 am: bdf37609 am: 57297674

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



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