Merge "Merge "[Media Projection] Require valid token to set session" into tm-dev am: 55ecb4ec am: 986c517b" into tm-d1-dev-plus-aosp