Merge \"Merge \\\"Fix rendering of policy transparency activity.\\\" into nyc-dev am: 98704bc495 am: 1ba2cbbfc2\" into nyc-mr1-dev-plus-aosp
am: a48e7e767b
Change-Id: I39c6c088f7e9445b8bd803f8d846d5c81ca3bb7e
This commit is contained in: