[automerger skipped] Backup settings for Assistant invocation am: 1a796cc550 am: d4c8fc0568 -s ours
am skip reason: Merged-In If4a0fd112f68aebbc343efc9e0d6ccbbe6b89036 with SHA-1 27380cc6ed is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19731296
Change-Id: Ib5a978f0f6d4b78aaa42e072dba915dee5a5520e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: