This reverts commit f2e67a5779d404b4791c6ab5b0d30dfb2c463514. bug: 2914259 open source change: https://review.source.android.com/#change,16419 Change-Id: I39df188a52ad9566aa523ce31f696886d4cdb980
This reverts commit f2e67a5779d404b4791c6ab5b0d30dfb2c463514. bug: 2914259 open source change: https://review.source.android.com/#change,16419 Change-Id: I39df188a52ad9566aa523ce31f696886d4cdb980