Merge "Unit tests for Multi-Default with Existing APIs" am: ed4288b164 am: 372d3e6868

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I71645ff80bf4da307e12f1a96dba832c434c0eff