[automerger skipped] Merge "Fix bug in Blend that did not use options." am:...

[automerger skipped] Merge "Fix bug in Blend that did not use options." am: 92ce7440 am: 4fa761b9 -s ours am: 003fbea4 -s ours am: d09316dd -s ours

am skip reason: Merged-In Ide2fef96137ffd89e4431cf15be5df398036d909 with SHA-1 a2c6eb2f is already in history

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



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