Merge "/proc/net/xt_qtaguid/ is long deprecated and never present/used" am: 6b29823f4a am: 8d0d63ea5e am: 6e503857c7

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1606488

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4bf5bdf2b161772cdc6ccbb7fdb098a9df11cb4d