Merge "Unhide RecoveryController#getRootCertificates()" into pi-dev
am: c6bd185565

Change-Id: Ib81d1997ee46034dff4c8b9c45836f434f660f1a