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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I64c6ede13000f5ca8cb00bffa77308a3d91ff168