Merge "Create a new Transaction to apply the edge extensions" into tm-dev am:...

Merge "Create a new Transaction to apply the edge extensions" into tm-dev am: 4d9da928 am: ea7d8255

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



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