Snap for 8564071 from a06f3e32ddac3d4ed41805756b225eb040844c19 to mainline-adbd-release

Change-Id: I12789ba7bc41133ce2b94e56e752886faf9ba479