Merge "Merge "Introduce a grace period for bg activity starts" into qt-dev am:...
Merge "Merge "Introduce a grace period for bg activity starts" into qt-dev am: 09575fa4 am: 7b8b990b" into qt-r1-dev-plus-aosp
am: ac4a95ad
Change-Id: I623b62e2342d6f2aedc372c25534d3f3ea18a8c8