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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibae6928e620a5029986b71b2cf13c3137d39be9d
tree: 6db77079cd70786c9174159f68e6cbe88b47bf51
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS