[automerger skipped] Merge "Unhide @SystemApi Constructor" am: 442b546e2a am: a56e388a75  -s ours
am: efa137b700  -s ours

Change-Id: Icd37a0835f52628322f7151db2a81042c1ca1c86