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

Change-Id: I3e60e7c533b78096800d5077c810483da747f1e6