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 am: d5f23766
Change-Id: I68fd3a331b9d3136f756661dd5953ad9e8b6eb06