[automerger skipped] [DO NOT MERGE] Allow manually specified time am:...

[automerger skipped] [DO NOT MERGE] Allow manually specified time am: ed1efe9f am: eb38e199 -s ours

am skip reason: subject contains skip directive

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



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