Merge "Unit tests for Multi-Default with Existing APIs" am: 090909cb3d am: 33451af2f2

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1579208

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I71645ff80bf4da307e12f1a96dba832c434c0eff
tree: 847c33ecde0d2b1adcc370225d08915205d712ca
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS