Merge "Merge "Require shortcut to bubble" into rvc-dev am: 1dbf98fb57 am: b60d52c691" into rvc-d1-dev-plus-aosp am: c729d7b60e

Change-Id: I89c79336dd27f7bf5ff60038042dc9334f5c7abe