This reverts commit 5f0139d2. Bug: 72877143 Test: Switch users, use MTP Change-Id: Ide372a9311a4f2647715d052fc0e1d9a04808aa0