Merge "Attempt to use snapshot starting window for task trampoline" into tm-dev am: 305e94ce

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



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