Merge "Merge "Defer broadcasting ACTION_DEFERRED_ACTIVITY_CHANGED until actual...
Merge "Merge "Defer broadcasting ACTION_DEFERRED_ACTIVITY_CHANGED until actual change" into qt-dev am: f883ea69" into qt-dev-plus-aosp
am: 310c1971
Change-Id: I3c0216435494cfb868a8dbbd1d2492bc584091a3