[automerger skipped] Merge "Remove the tethering hiddenapi whitelist entry" am: 083066201e am: acaa1e272b -s ours am: 2fd0292c0f -s ours
am skip reason: Change-Id I97af6d911c7e9bafdaa2a97102b2131dea6c0896 with SHA-1 e11221c738 is in history
Change-Id: Ie3cd2089481fe4b8bd8804346f1c31a51481cb1c
This commit is contained in: