Merge "Add overlayfinishing state." into tm-qpr-dev am: 7c24fe78c8

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

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