[automerger skipped] Merge "Move PublicFormat from libandroid_runtime to libui" am: 17f57c6ead am: 6c47c3b982
am: bf98bf8065 -s ours
am skip reason: change_id I7215dde607b425f7a0d47a6541b83fbe3a0deaf4 with SHA1 419fb440fe is in history

Change-Id: I658955f992c2074c55304be175677963555a1e45