* changes:
  [automerger skipped] Merge changes Iad41fa42,Ie37173d0,Ib923eafb,I9bff481a,I631f5e01, ... am: cc7dec54 am: 62afa55b am: c622b528 -s ours am: cd50298c -s ours am: 68f4315e -s ours
  [automerger skipped] Inform Application thread to block for network rules to be updated. am: 3bad67bf am: 11ca5138 am: 9eaceb33 -s ours am: 4300ee25 -s ours am: b769b8cd -s ours
  [automerger skipped] Update getUidProcessState to consider mPendingStartActivityUids. am: 46ddc965 am: 710fdef5 am: 54fd1236 -s ours am: 3ba29a1a -s ours am: 933573fa -s ours
  [automerger skipped] Inform AMS about the uid blocked reasons. am: eb5e04ae am: 7ee9ee6a am: f5698272 -s ours am: 9a53b0ad -s ours am: 1d46098e -s ours
  [automerger skipped] Ignore older UID state change callbacks in NPMS. am: efa4f742 am: 2a4f9d6d am: b013bf1b -s ours am: b5ca9fb0 -s ours am: eccd970b -s ours
  [automerger skipped] Inform NPMS about the app coming to the TOP state early. am: 3d9f5e63 am: 62163224 am: 250fae65 -s ours am: 72fb5fb2 -s ours am: 6c419d91 -s ours
  [automerger skipped] Optimize the handling of disabling doze state. am: 28d4a8f2 am: 15bcb7c3 am: 6c1afe25 -s ours am: e60c3ae3 -s ours am: a074e6e0 -s ours
  [automerger skipped] Fix the arguments order to postBlockedReasonsChangedMsg. am: 63a7d711 am: 614b4659 am: cc4f13f4 -s ours am: ac64418f -s ours am: 8c817b7a -s ours
  [automerger skipped] Avoid checking for idle state when the app is in top state. am: 99b5c0cb am: 595316fe am: 665f74cd -s ours am: 0dfa0e78 -s ours am: 72c84d2e -s ours
  [automerger skipped] Update network rules for only uids that are installed. am: c3580425 am: b8ea68c2 am: 1906fd1b -s ours am: 8287d226 -s ours am: e1cd85c3 -s ours
  [automerger skipped] Fix logs in NetworkPolicyManagerService. am: fa63f444 am: 745fbfce am: 9e090700 -s ours am: 426bf91b -s ours am: 9f9e7400 -s ours
  [automerger skipped] Guard mUidBlockedState with a separate lock. am: 6e0d64b9 am: 23aaa83c am: 63966a3d -s ours am: d25d451a -s ours am: 193578b2 -s ours
  [automerger skipped] Add SDK sandbox UIDs to network policy. am: d25240eb am: 2e36bb8e am: cefef44a -s ours am: 4052fa38 -s ours am: ee715004 -s ours
  [automerger skipped] Add some debugs to diagnose test failure. am: a54743a2 am: c82359bc am: 93dfc728 -s ours am: f42fba0b -s ours am: fe89272c -s ours