This reverts commit 1ab06de89f.
Bug: b/130586696
Reason for revert: b/130586696 This change causes a major breakage in Maps and blocks droidfood.
Change-Id: I50cde4865f48825b82f27087b8cac6e6527d6d95
This reverts commit 1ab06de89f.
Bug: b/130586696
Reason for revert: b/130586696 This change causes a major breakage in Maps and blocks droidfood.
Change-Id: I50cde4865f48825b82f27087b8cac6e6527d6d95