Merge "Fix potential deadlock in getAutofillOptions()." into rvc-dev am: 291a32c9 am: db72226d am: 7b34f445 Change-Id: Ifb5009c4cb52d70cc4b519e4d1cd7388929f040d