Note that TP1A.221005.003 is merged (aosp/2160462)

Merged-In: I1706ceb129ef95f44d45754665b9dbcf9b6fdfd4
Change-Id: I3c4a819bf450f1e2ae0891536f1f4266c543f692