Name them framework-* and service-* instead of *-(framework|service).
This matches the proposal in go/android-apex-for-framework.

Test: treehugger
Change-Id: I16754a5f08e002a8bc8862b11281f12cc6c8739f

* changes:
  Move ensure activity visibility processing to helper class (72/n)
  Attempt to break down reset task codepath (71/n)

am: 689403c3

Change-Id: I8e8d117020327593833536ae7ee43e5b94899c9e

am: dca2d456

Change-Id: I705e0967e993237d9f1ac2b276e66fab2422f098

[automerger skipped] Merge "Update equals and hashCode methods of NoMan.Policy" into qt-qpr1-dev am: d6dfaf4c -s ours
am: 72594630 -s ours
am skip reason: change_id I15835f784ba73b40eccf92a0a430905d28647669 with SHA1 4f8b0224 is in history

Change-Id: I7b342c0cf83413a0a1ff9dc711eb03f68831240a

am: c8bd4aec

Change-Id: I3b8ff8e7c754b12778e40a9abcc829fb7a12671b

am: d6dfaf4c -s ours
am skip reason: change_id I15835f784ba73b40eccf92a0a430905d28647669 with SHA1 3fe3e819 is in history

Change-Id: I297ae155044ca082cf1fb3002e2dcd0ce2281a82

[automerger skipped] Merge "DO NOT MERGE Initialize VolumeUI when volume change event is received." into qt-qpr1-dev am: 8d11d8ca
am: ab50acdb -s ours
am skip reason: subject contains skip directive

Change-Id: I48eafdd7fe3f106e7a8d3f8570ac7164716c0436

[automerger skipped] DO NOT MERGE Initialize VolumeUI when volume change event is received. am: 5d45afee
am: 1e1c4df7 -s ours
am skip reason: subject contains skip directive

Change-Id: I617a9a05c597976cca89cac06f3a6a8f8cf21e0e

am: 8d11d8ca

Change-Id: I661a33c035b4397c0f746f51acc43328382e88bc

am: 5d45afee

Change-Id: I1bdbeea557aca35b20972dd4f4205fb29a049a7d

Treehugger didn't hit this with the original CL (ag/9721403) but I'm
hitting it locally & believe it is the root cause of attached bug.

Test: atest NotificationManagerTest (doesn't crash)
Bug: 144947853
Bug: 144958550
Change-Id: I3a03097b1e81b81a1847ef46422a052df726eb7d

In the test below it only expects MockSprite#setIcon() being called
once, but with animation it may be called multiple times.

Bug: 144947344
Test: atest PoitnerControllerTest#updatePointerIcon
Change-Id: I5c4908fb8301cae144fd637c831f2012a35862e3

* changes:
  Add HidlMemoryUtil
  Add parceling support for HIDL memory in Java

am: 12bfd308

Change-Id: I7f65f3bbb777eec8b0a78718daa0545ea0349c4d

* changes:
  Prune obsolete UsageStats data on upgrade.
  Add a job to prune UsageStats data on package removals.

* changes:
  Add new WifiManager API to calculate signal levels
  Fix broken test caused by calculateSignalLevel() migration
  Migrate WifiStatusTracker calculateSignalLevel()

am: 55e22074

Change-Id: Ic49428aa0012cbaae293aea7bbcaafb42459e2f8

am: 07235288

Change-Id: Ic77adb515a9fea1dfa238908e3e4c754408d4103

* changes:
  Move AP Band Conversion notification to Settings
  Remove WifiManager.notifyUserOfApBandConversion()

[automerger skipped] Merge "Expose SmsCbLocation and SmsCbMessage constructors" am: d87727f7 am: 850525ff
am: 6ac19321 -s ours
am skip reason: change_id Ic2a58005db6f5d01b6769b84b8cf7d5f013bbbf1 with SHA1 0d76fbd0 is in history

Change-Id: I386558973299ca0998fd8bd214828e00a9935135

am: 850525ff

Change-Id: I905e9aff73ac79a4a8e917296bb8bc0077371844