Merge "Merge "Increases the shortcut limit to 15 per activity" into rvc-dev...
Merge "Merge "Increases the shortcut limit to 15 per activity" into rvc-dev am: df2f706d am: 07e58a99" into rvc-d1-dev-plus-aosp am: 205a7665
Change-Id: I24b92abfefe5c97301203a2d793afe8abb1426a8