[automerger skipped] Merge "[DO NOT MERGE] Allow manually specified time" into...

[automerger skipped] Merge "[DO NOT MERGE] Allow manually specified time" into tm-qpr-dev am: aad4ac79 am: a0305ba9 -s ours

am skip reason: subject contains skip directive

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



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