Merge "Fix bug in Blend that did not use options." am: 92ce74409b

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

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