Merge "Add "operator bool" overload to android::sp." am: 28ebfe18fb am: 56c22732c6 am: a915e99e04
am: 6b82ada2e0

Change-Id: I699fcaab38beacfa622c379e0ec3cc35fccd1add